On branch mergify/bp/release/v0.50.x/pr-17787
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit 6715b5afb.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   api/cosmos/tx/signing/v1beta1/signing.pulsar.go
	modified:   api/cosmos/tx/v1beta1/tx.pulsar.go
	modified:   baseapp/baseapp.go
	modified:   client/tx/aux_builder.go
	modified:   client/tx/aux_builder_test.go
	modified:   client/tx/legacy_test.go
	modified:   client/tx/tx_test.go
	modified:   client/tx_config.go
	modified:   docs/docs/develop/advanced/00-baseapp.md
	modified:   docs/docs/develop/advanced/01-transactions.md
	modified:   proto/cosmos/tx/signing/v1beta1/signing.proto
	modified:   proto/cosmos/tx/v1beta1/tx.proto
	modified:   simapp/app.go
	modified:   simapp/simd/cmd/commands.go
	modified:   tests/e2e/auth/suite.go
	modified:   tests/integration/auth/client/cli/suite_test.go
	modified:   tests/integration/tx/aminojson/aminojson_test.go
	modified:   types/tx/direct_aux.go
	modified:   types/tx/direct_aux_test.go
	modified:   types/tx/signing/signing.pb.go
	deleted:    types/tx/tips.go
	modified:   types/tx/tx.pb.go
	modified:   x/auth/README.md
	deleted:    x/auth/client/cli/tips.go
	modified:   x/auth/client/testutil/helpers.go
	modified:   x/auth/migrations/legacytx/stdsign.go
	modified:   x/auth/migrations/legacytx/stdtx.go
	modified:   x/auth/migrations/legacytx/stdtx_builder.go
	modified:   x/auth/migrations/legacytx/stdtx_test.go
	deleted:    x/auth/posthandler/tips.go
	modified:   x/auth/signing/sig_verifiable_tx.go
	modified:   x/auth/tx/adapter.go
	modified:   x/auth/tx/builder.go
	modified:   x/auth/tx/legacy_amino_json.go
	modified:   x/auth/tx/legacy_amino_json_test.go
	modified:   x/authz/msgs_test.go
	modified:   x/feegrant/msgs_test.go
	modified:   x/tx/decode/decode_test.go
	modified:   x/tx/signing/aminojson/aminojson.go
	modified:   x/tx/signing/aminojson/aminojson_test.go
	modified:   x/tx/signing/aminojson/internal/aminojsonpb/aminojson.proto
	modified:   x/tx/signing/aminojson/internal/aminojsonpb/aminojson.pulsar.go
	modified:   x/tx/signing/directaux/direct_aux.go
	modified:   x/tx/signing/directaux/direct_aux_test.go
	modified:   x/tx/signing/testutil/util.go
	modified:   x/tx/signing/textual/internal/testdata/e2e.json
	modified:   x/tx/signing/textual/internal/testdata/tx.json
	modified:   x/tx/signing/textual/internal/textualpb/textual.proto
	modified:   x/tx/signing/textual/tx.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   client/tx/factory.go
	both modified:   client/tx/tx.go
	deleted by them: docs/docs/develop/advanced/14-tips.md
	both modified:   x/auth/tx/aux_test.go
	deleted by us:   x/tx/decode/fuzz_test.go
	deleted by us:   x/tx/signing/aminojson/fuzz_test.go